Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 14:31:59 +0000 (07:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 9 Sep 2011 14:31:59 +0000 (07:31 -0700)
commit4696680f73e286baad9d6b79591d9f02b1c995e9
tree721251505efb7cfc0c3dfb72f0ecb6b3ec4786da
parentd5b1f538cf688fb0535e505d5ceac8b86781a99c
parent9540dfa4c4222b0dc3a29c11e7bbb27809bb2a33
Merge from trunk.